From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Wed, 6 Jan 2010 09:16:36 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8462^2~60
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e849ef1f8c9f44f87fa83d1b042a69abf2d5bb5d;p=emacs.git

Merge from mainline.
---

e849ef1f8c9f44f87fa83d1b042a69abf2d5bb5d
diff --cc lisp/gnus/ChangeLog
index b992b9e30e7,b992b9e30e7..158e4b90c9a
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@@ -1,3 -1,3 +1,10 @@@
++2010-01-06  Katsumi Yamaoka  <yamaoka@jpl.org>
++
++	* gnus-art.el (gnus-article-describe-bindings): Work for prefix keys.
++
++	* message.el (message-check-news-header-syntax): Protect against a
++	string that `rfc822-addresses' returns when parsing fails.
++
  2010-01-06  Katsumi Yamaoka  <yamaoka@jpl.org>
  
  	* gnus-util.el (gnus-invisible-p, gnus-next-char-property-change)
diff --cc lisp/gnus/gnus-art.el
index 6bc84e42225,6bc84e42225..dcb63883997
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@@ -6477,10 -6477,10 +6477,17 @@@ then we display only bindings that star
    (let ((keymap (copy-keymap gnus-article-mode-map))
  	(map (copy-keymap gnus-article-send-map))
  	(sumkeys (where-is-internal 'gnus-article-read-summary-keys))
--	agent draft)
++	parent agent draft)
      (define-key keymap "S" map)
      (define-key map [t] nil)
      (with-current-buffer gnus-article-current-summary
++      (set-keymap-parent
++       keymap
++       (if (setq parent (keymap-parent gnus-article-mode-map))
++	   (prog1
++	       (setq parent (copy-keymap parent))
++	     (set-keymap-parent parent (current-local-map)))
++	 (current-local-map)))
        (set-keymap-parent map (key-binding "S"))
        (let (key def gnus-pick-mode)
  	(while sumkeys
diff --cc lisp/gnus/message.el
index 18feee83032,18feee83032..941fa92b8b3
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@@ -5077,7 -5077,7 +5077,8 @@@ Otherwise, generate and save a value fo
  	  "Denied posting -- the From looks strange: \"%s\"." from)
  	 nil)
  	((let ((addresses (rfc822-addresses from)))
--	   (while (and addresses
++	   ;; `rfc822-addresses' returns a string if parsing fails.
++	   (while (and (consp addresses)
  		       (not (eq (string-to-char (car addresses)) ?\()))
  	     (setq addresses (cdr addresses)))
  	   addresses)